@@ -20,7 +20,7 @@ from coupon.models import CouponInfo, UserCouponInfo  | 
            ||
| 20 | 20 | 
                from integral.models import SaleclerkSubmitLogInfo  | 
            
| 21 | 21 | 
                from logs.models import ComplementCodeLogInfo, MchInfoEncryptLogInfo  | 
            
| 22 | 22 | 
                from mch.models import AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo  | 
            
| 23 | 
                -from member.models import GoodsInfo, GoodsOrderInfo, MemberActivityGroupShareInfo, MemberActivityInfo  | 
            |
| 23 | 
                +from member.models import GoodsInfo, GoodsOrderInfo, MemberActivityGroupShareInfo, MemberActivityInfo, MemberActivitySignupInfo  | 
            |
| 24 | 24 | 
                from pre.custom_message import sendwxasubscribemessage, sendtemplatemessage  | 
            
| 25 | 25 | 
                from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo  | 
            
| 26 | 26 | 
                from utils.error.errno_utils import (AdministratorStatusCode, ComplementCodeStatusCode, ProductBrandStatusCode,  | 
            
                @@ -1134,6 +1134,31 @@ def member_activity_share_list(request):  | 
            ||
| 1134 | 1134 | 
                'total_integral': total_integral  | 
            
| 1135 | 1135 | 
                })  | 
            
| 1136 | 1136 | 
                 | 
            
| 1137 | 
                +def member_activity_register_list(request):  | 
            |
| 1138 | 
                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            |
| 1139 | 
                +    admin_id = request.POST.get('admin_id', '')
               | 
            |
| 1140 | 
                +    activity_id = request.POST.get('activity_id', '')
               | 
            |
| 1141 | 
                +    page = int(request.POST.get('page', 1))
               | 
            |
| 1142 | 
                +    num = int(request.POST.get('num', 20))
               | 
            |
| 1143 | 
                +  | 
            |
| 1144 | 
                + if brand_id != settings.KODO_DEFAULT_BRAND_ID:  | 
            |
| 1145 | 
                + return response(ProductBrandStatusCode.BRAND_NOT_MATCH)  | 
            |
| 1146 | 
                +  | 
            |
| 1147 | 
                + try:  | 
            |
| 1148 | 
                + administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)  | 
            |
| 1149 | 
                + except AdministratorInfo.DoesNotExist:  | 
            |
| 1150 | 
                + return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)  | 
            |
| 1151 | 
                +  | 
            |
| 1152 | 
                + logs = MemberActivitySignupInfo.objects.filter(activity_id=activity_id, status=True)  | 
            |
| 1153 | 
                +  | 
            |
| 1154 | 
                + count = logs.count()  | 
            |
| 1155 | 
                + logs, left = pagination(logs, page, num)  | 
            |
| 1156 | 
                +  | 
            |
| 1157 | 
                +    return response(200, 'Get Member Activity Record Success', u'获取会员活动成功', data={
               | 
            |
| 1158 | 
                + 'logs': list(logs),  | 
            |
| 1159 | 
                + 'count': count,  | 
            |
| 1160 | 
                + 'left': left,  | 
            |
| 1161 | 
                + })  | 
            |
| 1137 | 1162 | 
                 | 
            
| 1138 | 1163 | 
                def coupon_list(request):  | 
            
| 1139 | 1164 | 
                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            
                @@ -167,6 +167,7 @@ urlpatterns += [  | 
            ||
| 167 | 167 | 
                url(r'^admin/member/activity/update$', admin_views.member_activity_update, name='member_activity_update'),  | 
            
| 168 | 168 | 
                url(r'^admin/member/activity/create$', admin_views.member_activity_create, name='member_activity_create'),  | 
            
| 169 | 169 | 
                url(r'^admin/member/activity/share/list$', admin_views.member_activity_share_list, name='member_activity_share_list'),  | 
            
| 170 | 
                + url(r'^admin/member/activity/register/list$', admin_views.member_activity_register_list, name='member_activity_register_list'),  | 
            |
| 170 | 171 | 
                 | 
            
| 171 | 172 | 
                url(r'^admin/coupon/list$', admin_views.coupon_list, name='coupon_list'),  | 
            
| 172 | 173 | 
                url(r'^admin/coupon/details$', admin_views.coupon_details, name='coupon_update'),  |